From: Jason Rumney <jasonr@gnu.org>
Date: Wed, 5 May 2004 23:22:41 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~22700
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=a693d92fc17b470667a345bf61f3a54870256a55;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 5e15e9828da..68c610c4387 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-06  Jason Rumney  <jasonr@gnu.org>
+
+	* image.c (Display) [HAVE_NTGUI]: Redefine while loading xpm.h
+	to avoid name clash.
+
 2004-05-04  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* fileio.c (barf_or_query_if_file_exists): Use lstat.